diff --git a/include/configs/draco.h b/include/configs/draco.h
index 4869008..d1c7abe 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -19,7 +19,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27	/* Use as default */
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
@@ -34,7 +34,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 811c7cb..8bfc9c9 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -56,7 +56,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 /* In dfu mode keep led1 on */
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"button_dfu1=87\0" \
 	"led0=3,0,1\0" \
@@ -134,7 +134,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 586a7ed..eafa6ae 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -18,7 +18,7 @@
 #define DDR_IOCTRL_VAL		0x18b
 #define DDR_PLL_FREQ		266
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=59\0" \
 	"led0=117,0,1\0" \
 
@@ -34,7 +34,7 @@
 	"nand_img_size=0x500000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"splashpos=m,m\0"	\
 	CONFIG_ENV_SETTINGS_V1 \
 	CONFIG_ENV_SETTINGS_NAND_V1 \
diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 49cd11c..2e002fa 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -21,7 +21,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 /* In dfu mode keep led1 on */
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"button_dfu1=87\0" \
 	"led0=3,0,1\0" \
@@ -44,7 +44,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2
 
diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 696306e..25c5a8c 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -19,7 +19,7 @@
 #define BOARD_DFU_BUTTON_GPIO	27	/* Use as default */
 #define GPIO_LAN9303_NRST	88	/* GPIO2_24 = gpio88 */
 
-#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+#define CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	"button_dfu0=27\0" \
 	"led0=103,1,0\0" \
 	"led1=64,0,1\0"
@@ -37,7 +37,7 @@
 	"nand_img_size=0x400000\0" \
 	"optargs=\0" \
 	"preboot=draco_led 0\0" \
-	CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+	CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
 	CONFIG_ENV_SETTINGS_V2 \
 	CONFIG_ENV_SETTINGS_NAND_V2